widget: Avoid some more ->priv accesses
authorTimm Bäder <mail@baedert.org>
Thu, 18 Oct 2018 10:00:47 +0000 (12:00 +0200)
committerTimm Bäder <mail@baedert.org>
Thu, 8 Nov 2018 04:13:50 +0000 (05:13 +0100)
gtk/gtkwidget.c

index c8aba33e8c18e379b26cb60869fb7b030edb7873..0ca54c1b3f0d376ef8bde4bb0d0b0dad6ba37e86 100644 (file)
@@ -7974,7 +7974,11 @@ gtk_widget_get_ancestor (GtkWidget *widget,
   g_return_val_if_fail (GTK_IS_WIDGET (widget), NULL);
 
   while (widget && !g_type_is_a (G_OBJECT_TYPE (widget), widget_type))
-    widget = widget->priv->parent;
+    {
+      GtkWidgetPrivate *priv = gtk_widget_get_instance_private (widget);
+
+      widget = priv->parent;
+    }
 
   return widget;
 }
@@ -8019,9 +8023,12 @@ gtk_widget_is_ancestor (GtkWidget *widget,
 
   while (widget)
     {
-      if (widget->priv->parent == ancestor)
-       return TRUE;
-      widget = widget->priv->parent;
+      GtkWidgetPrivate *priv = gtk_widget_get_instance_private (widget);
+
+      if (priv->parent == ancestor)
+        return TRUE;
+
+      widget = priv->parent;
     }
 
   return FALSE;